Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Thu, 20 Sep 2007 09:55:24 +0000 (10:55 +0100)
committerTim Deegan <Tim.Deegan@xensource.com>
Thu, 20 Sep 2007 09:55:24 +0000 (10:55 +0100)

Trivial merge